From 1299c1df6fc2f5a397176a2edb2c224380c339cb Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Fri, 5 Jan 2001 19:51:55 +0000 Subject: [PATCH] this function was broken if called on the first position in the buffer. 2001-01-05 Havoc Pennington * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was broken if called on the first position in the buffer. * gtk/gtktextlayout.c (line_display_index_to_iter): fix forward_to_delimiters to be called only if we aren't already at the delimiters. --- ChangeLog | 9 +++++++++ ChangeLog.pre-2-0 | 9 +++++++++ ChangeLog.pre-2-10 | 9 +++++++++ ChangeLog.pre-2-2 | 9 +++++++++ ChangeLog.pre-2-4 | 9 +++++++++ ChangeLog.pre-2-6 | 9 +++++++++ ChangeLog.pre-2-8 | 9 +++++++++ gtk/gtktextiter.c | 2 +- gtk/gtktextlayout.c | 4 +++- 9 files changed, 67 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ef9005fcb9..047e768ad4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2001-01-05 Havoc Pennington + + * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was + broken if called on the first position in the buffer. + + * gtk/gtktextlayout.c (line_display_index_to_iter): fix + forward_to_delimiters to be called only if we aren't already at + the delimiters. + 2001-01-05 Havoc Pennington * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index ef9005fcb9..047e768ad4 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +2001-01-05 Havoc Pennington + + * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was + broken if called on the first position in the buffer. + + * gtk/gtktextlayout.c (line_display_index_to_iter): fix + forward_to_delimiters to be called only if we aren't already at + the delimiters. + 2001-01-05 Havoc Pennington * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index ef9005fcb9..047e768ad4 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2001-01-05 Havoc Pennington + + * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was + broken if called on the first position in the buffer. + + * gtk/gtktextlayout.c (line_display_index_to_iter): fix + forward_to_delimiters to be called only if we aren't already at + the delimiters. + 2001-01-05 Havoc Pennington * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index ef9005fcb9..047e768ad4 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2001-01-05 Havoc Pennington + + * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was + broken if called on the first position in the buffer. + + * gtk/gtktextlayout.c (line_display_index_to_iter): fix + forward_to_delimiters to be called only if we aren't already at + the delimiters. + 2001-01-05 Havoc Pennington * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index ef9005fcb9..047e768ad4 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2001-01-05 Havoc Pennington + + * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was + broken if called on the first position in the buffer. + + * gtk/gtktextlayout.c (line_display_index_to_iter): fix + forward_to_delimiters to be called only if we aren't already at + the delimiters. + 2001-01-05 Havoc Pennington * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index ef9005fcb9..047e768ad4 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2001-01-05 Havoc Pennington + + * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was + broken if called on the first position in the buffer. + + * gtk/gtktextlayout.c (line_display_index_to_iter): fix + forward_to_delimiters to be called only if we aren't already at + the delimiters. + 2001-01-05 Havoc Pennington * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index ef9005fcb9..047e768ad4 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2001-01-05 Havoc Pennington + + * gtk/gtktextiter.c (gtk_text_iter_ends_line): this function was + broken if called on the first position in the buffer. + + * gtk/gtktextlayout.c (line_display_index_to_iter): fix + forward_to_delimiters to be called only if we aren't already at + the delimiters. + 2001-01-05 Havoc Pennington * demos/gtk-demo/main.c (create_tree): Oops, that didn't link. Fix. diff --git a/gtk/gtktextiter.c b/gtk/gtktextiter.c index c085fb3266..3dc422e2fe 100644 --- a/gtk/gtktextiter.c +++ b/gtk/gtktextiter.c @@ -1366,7 +1366,7 @@ gtk_text_iter_ends_line (const GtkTextIter *iter) */ GtkTextIter tmp = *iter; if (!gtk_text_iter_backward_char (&tmp)) - return FALSE; + return TRUE; return gtk_text_iter_get_char (&tmp) != '\r'; } diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c index 035d4935a8..315dbf8d99 100644 --- a/gtk/gtktextlayout.c +++ b/gtk/gtktextlayout.c @@ -1954,7 +1954,9 @@ line_display_index_to_iter (GtkTextLayout *layout, _gtk_text_btree_get_iter_at_line (_gtk_text_buffer_get_btree (layout->buffer), iter, display->line, 0); - gtk_text_iter_forward_to_delimiters (iter); + + if (!gtk_text_iter_ends_line (iter)) + gtk_text_iter_forward_to_delimiters (iter); } /* FIXME should this be cursor positions? */ -- 2.30.2